Update kaminari to fix URL sanitization exceptions in production

Dominik Sander 7 years ago
parent
commit
b3a5592583
2 changed files with 11 additions and 5 deletions
  1. 1 1
      Gemfile
  2. 10 4
      Gemfile.lock

+ 1 - 1
Gemfile

@@ -103,7 +103,7 @@ gem 'jquery-rails', '~> 4.2.1'
103 103
 gem 'huginn_agent', '~> 0.4.0'
104 104
 gem 'json', '~> 1.8.1'
105 105
 gem 'jsonpathv2', '~> 0.0.8'
106
-gem 'kaminari', '~> 0.16.2'
106
+gem 'kaminari', github: "amatsuda/kaminari", branch: '0-17-stable'
107 107
 gem 'kramdown', '~> 1.3.3'
108 108
 gem 'liquid', '~> 3.0.3'
109 109
 gem 'mini_magick'

+ 10 - 4
Gemfile.lock

@@ -1,4 +1,13 @@
1 1
 GIT
2
+  remote: git://github.com/amatsuda/kaminari.git
3
+  revision: abbf93d557208ee1d0b612c612cd079f86ed54f4
4
+  branch: 0-17-stable
5
+  specs:
6
+    kaminari (0.17.0)
7
+      actionpack (>= 3.0.0)
8
+      activesupport (>= 3.0.0)
9
+
10
+GIT
2 11
   remote: git://github.com/cantino/twitter-stream.git
3 12
   revision: f7e7edb0bae013bffabf3598e7147773d9fd370f
4 13
   branch: huginn
@@ -288,9 +297,6 @@ GEM
288 297
     jsonpathv2 (0.0.8)
289 298
       multi_json
290 299
     jwt (1.4.1)
291
-    kaminari (0.16.3)
292
-      actionpack (>= 3.0.0)
293
-      activesupport (>= 3.0.0)
294 300
     kgio (2.10.0)
295 301
     kramdown (1.3.3)
296 302
     launchy (2.4.2)
@@ -633,7 +639,7 @@ DEPENDENCIES
633 639
   jquery-rails (~> 4.2.1)
634 640
   json (~> 1.8.1)
635 641
   jsonpathv2 (~> 0.0.8)
636
-  kaminari (~> 0.16.2)
642
+  kaminari!
637 643
   kramdown (~> 1.3.3)
638 644
   letter_opener_web (~> 1.3.0)
639 645
   liquid (~> 3.0.3)